merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 30 Nov 2011 06:19:27 +0000 (15:19 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 30 Nov 2011 06:19:27 +0000 (15:19 +0900)
commitb1a6be68572a5e68507ef7f7a6d1a56169f1b1c1
treed281b4147d10027a4e19874468f456af7964985d
parent8eded88ac94cacd4c3dc57646fd6a2db7f1df155
parent75f00b2ac62b1f7a172a69d47489166d79c341a7
merge trunk